Revert change to vtpm_utils related to skipping the test when the tpm is not

found -- we need to skip the test on non-TPM platforms, of course.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py
index 70af1d30f804bc86ce95502bcdf3cec966a83812..01a60f90c64ad5d1c006af1b54eab8824ad54fc4 100644 (file)
--- a/tools/xm-test/tests/vtpm/vtpm_utils.py
+++ b/tools/xm-test/tests/vtpm/vtpm_utils.py
@@ -8,6 +8,9 @@ from XmTestLib import *
 if ENABLE_HVM_SUPPORT:
     SKIP("vtpm tests not supported for HVM domains")
 
+if not os.path.exists("/dev/tpm0"):
+    SKIP("This machine has no hardware TPM; cannot run this test")
+
 status, output = traceCommand("ps aux | grep vtpm_manager | grep -v grep")
 if output == "":
     FAIL("virtual TPM manager must be started to run this test")